Merged
Conversation
benflexcompute
changed the title
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
angranl-flex
approved these changes
Apr 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
git cherry-pickas a real conflict only when unmerged paths are presentauto-hotfixPRs that still add a full set of Git conflict markers in their diffWhy
The hotfix workflow was conflating any cherry-pick failure with merge conflicts and could describe conflict PRs as already resolved. That made the workflow misleading and left merge safety dependent on whatever CI happened to catch.
Impact
auto-hotfixPR diffs are explicitly blocked from mergeValidation
git diff --checkNote
Medium Risk
Changes GitHub Actions logic for creating and gating hotfix PRs; mistakes could incorrectly fail runs or block/allow merges on
auto-hotfixPRs.Overview
Improves the hotfix PR automation to distinguish true cherry-pick merge conflicts from other cherry-pick failures by only treating failures with unmerged paths as conflicts (and failing loudly otherwise).
Updates conflict hotfix PR messaging to explicitly require manual conflict resolution and includes the list of conflicted files in the PR body.
Tightens the
hotfix-tracking-guardworkflow so it only runs checks for PRs labeledauto-hotfix, and additionally blocks those PRs if their diff adds full Git conflict markers (while keeping the existing placeholder-file guard for manual tracking PRs).Written by Cursor Bugbot for commit 2adcd58. This will update automatically on new commits. Configure here.